Merge changes from topic "am-76a20f08-9212-4001-a52b-dd38a93faa9b" into oc-dev
am: 9ede115c2b

Change-Id: Ida64b0840ce3569aa8a3ca5bb82a08de30ba3a23