Compliant to reference software HM11.0 onwards Bug: 14571712 Change-Id: I8af25c1221cc6ab70440141c4d9b48c1ac69696a