Merge changes from topic "am-51363a78-f167-48aa-956c-f9bfd551a3a5" into oc-dev am: 471a4e6076
am: 5c6dd2cd0c

Change-Id: I678702bc19a9bf20c5e2884babd2395363c41f64