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

Change-Id: I42858af9b3a8d5e436ce9bbff0a697290f9803d9