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

Change-Id: I47a21524cb665cd96f6fda218cff615a90780031