Merge changes from topic "am-23390ed3-ed93-4bd6-8f8c-2edf2967e68d" into oc-dev
am: 4256e2ca92

Change-Id: I9434aa9a52f1e8269a3401f4f5bf900f3daa5398