Merge changes from topic "b/125900276" into oc-dev
am: 783d7858c2

Change-Id: I2f1699be6c2449e19fc29044a0b105311f7e6bc4