DO NOT MERGE resolve merge conflicts of 1d43fb67 to mnc-dev am: 1d462cdbb0 Change-Id: I1e527667db9aa5740d135f966e27f52394710eed (cherry picked from commit e3bbe40b5c344e2964787c687f1bce27c5b2cc63)