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

Change-Id: I9f8db823227ec83b3a7b56db7df8d8518c4dfce8