and foce-fix errors using pocheck Change-Id: I12d26e666d46993fd4ff26616c09be9e5bf82fcd
and force-fix errors using pocheck Change-Id: I47e8da2f3c05fe79e9d5f79b5e1be051f479d567 (cherry picked from commit 624987b5ec5daaf270b065048dcf11f487edfd4d)
Change-Id: Ie5bf8ab575cb94b341c277daa0cd9f6f2f6871f0