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

Change-Id: I0b560eaeefd4477140e5e2a68fa6df6a84900346