Merge changes from topic "am-8d44d2e5-2b24-4867-a4fc-1c5b430ac3a0" into oc-dev
am: ecc48fbc96

Change-Id: Ie784856bd6bdb05921d7a3c6423ab7d103e5133c