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

Change-Id: Ib90ed41698e308d53a2619abe2fa6f028eeaf07a