Merge changes from topic "am-72eed970-759d-4148-b4df-72c2aa104b56" into oc-dev
am: 3850cf69e3

Change-Id: Ic7be79fc9564f5c3fda0e6874be6eb1f7edbb143