Merge changes from topic "revert-64710074" into oc-dev am: 8b69ecb40d
am: 3592a85f17

Change-Id: I552902c472e3e768754df4a7a3b937c154b5147c