resolve merge conflicts of 44e07e07 to mnc-dev am: 825b7134 am: 8c635e73 am: 343600c3 am: b965ced0  -s ours am: 129c01af am: e3e398f1
am: 75168a04

* commit '75168a04':

Change-Id: I22fdc7e18e8015fb74832c07620a088e1e1b2cbf