Merge "Merge "Merge changes Iea55330d,I547319f2 am: 7369c92f am: 6bf19f7c" into oc-dev-plus-aosp am: cefbb705" into oc-dr1-dev-plus-aosp am: c223f1ff Change-Id: Ice60e8eb8bc069f438a92850248563c0ed2e71ee