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