Merge "Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ......

Merge "Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into mnc-dev am: be4965a1 am: 1510bd88 am: b65042ce am: 8f3b11f7 am: 26afb21a am: 60df077e am: 689c07f1 am: 358689af am: 8a93fed2 am: d2e8e247" into oc-dev-plus-aosp
am: fed9f94a

Change-Id: I410f46ddb095eb4819206c8cffd4549395050a3c