Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev
am: b6b6c01847

Change-Id: I3bd011083894e1db22b90d38d71a0807facd151f