Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into mnc-dev am: be4965a1 am: 1510bd88 am: b65042ce am: 8f3b11f7 am: 26afb21a am: 60df077e Change-Id: Ibcd7f7a30a739c2803b2bd93ac33b2eeeaf1d8eb