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

Change-Id: I034f2ff1c9019153b335a0f8b792a2b0d550f229