Merge changes from topic "am-45b398c5-1b45-4876-91cb-b88473f164b9" into oc-dev am: 23c4fa36f0 am: 486fd1477c
am: 31df75e610

Change-Id: I8cd59a70d9a94f84dd4f1d990e10424ca8583d54