Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into mnc-dev am: be4965a142 am: 1510bd88c2 am: b65042cea0
am: 8f3b11f74f

Change-Id: I0f2972b8874eb423ac8fa033fa3db67dcbc94ccd