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

Change-Id: Id07ce1cab93362f67b0501830d18db384a24deb3