Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev am: cff09946 am: 21060a9e am: 72100b44 Change-Id: I5ca6d17de7a450265ab534d078e238408fa16f97