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

Change-Id: Ia3b7fbe98a5ffc125ffa9e1ebdc677076814be7c