Merge changes from topic "am-8dbc037c-490f-442d-957b-fea681fe1136" into oc-dev am: dd05e2d932
am: ea5b2a818d

Change-Id: I824e17d5fcf0fcd7865d151a7d32b4991f045399