Merge changes from topic 'onarevert' into oc-dev
am: fa0b28220b

Change-Id: I744b3dd5c4b58042e1460f161c2813f34784dc32