Merge changes from topic "am-06853e6c108343be9f3dae60afe35875" into oc-dev am: dfa865bf3c am: 86aa5bca0f am: 162d0c7a61
am: 1790bb12eb

Change-Id: Ia321cecae67c1d1eaa785c551b400be38bdabb6f