Merge changes from topic "am-0b54e3df-be82-462c-92ce-d33585c1a919" into oc-dev
am: 6df61a52f4

Change-Id: I53db15fcb579d0549b7e0b8ab3db3e3442c04933