Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into mnc-dev am: be4965a1 am: 1510bd88 am: b65042ce Change-Id: I0357649009df006dcdda036b4937217b8e4f26b2