Change-Id: I0ed5d948cf89a4260c8771057d463448b76a4527
and force-fix errors using pocheck Change-Id: Id45e0dc7161738ebd69ba07108b9fdd149643703