Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev am: cff099466e am: 21060a9e0d am: 72100b44e8
am: af6e397fe8

Change-Id: I7a1d6554887d74c5f5905ece2d65900fbbcec360