Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into mnc-dev
am: be4965a142

Change-Id: I78bca41754d481940d7c0dcb52c676b1e6686fbc