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

Change-Id: I048bd2b6b98cc057038600e7d6c1c6d4f68430f4