am 91e5b0f5: Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev

* commit '91e5b0f598f19499e55dcb8f0243b430e3c1ee4f':
  Support for devices with a chin.