Merge "Merge changes Ie2676b20,Ie8db6f85 am: 61901dde am: 4188432a am: 7d16886c" into oc-mr1-dev-plus-aosp