Merge changes from topic "am-0b54e3df-be82-462c-92ce-d33585c1a919" into oc-dev am: 6df61a52f4 am: 0e0c772361 am: 312fc5f343 am: 509e9fcf4a
am: 76aaa677e7

Change-Id: I1a2d46517b16a61ef5bf7d62a8485543f74f493b