Merge changes from topic "b-68279369" into oc-dr1-dev am: 885bf1302e  -s ours am: 74fc763fc8
am: 24d9be59da

Change-Id: Iefb3b38fb3f73b1ef42d8fed7d065bb02ec8eaf0