Merge changes from topic "am-32ac52b1-d1ae-4650-b9ae-368d8cd519cb" into oc-dev am: 8b047ec8a2 am: 245cc0559f
am: 0f4152e815

Change-Id: I49e413e32d9db706eaa5a56fc84f9998a47b8a9e