resolve merge conflicts of 79cf158c51 to mnc-dev

Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643