Merge "Merge "Merge changes Iea55330d,I547319f2 am: 7369c92fbc am: 6bf19f7c77" into oc-dev-plus-aosp am: cefbb705d2" into oc-dr1-dev-plus-aosp
am: 2ac99aae71

Change-Id: I4753e3afde0cd62af6524004066ec3603a8e29a6