Merge "Merge changes I4719b4dc,I0308cdf4,I38db1bb7 am: a3c28cc5 am: 3fce811d am: b025492a" into oc-mr1-dev-plus-aosp