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

Change-Id: I588d69e2c34f5fd9bf9a728be8d0049f8654aac5