Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev am: bc7da75f87 am: 8c06bfb6a4 am: 77a8b4d7d7
am: 61ae1cfe63

Change-Id: I6e498723a483c2a3df0220aebb78899eb3e1864b