Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev
am: 70060539aa

Change-Id: I871256a76c3af4e37959f729389114c694e15596