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

Change-Id: Ia35e09b9935da7bd63f08afd82dac950a9acd344