Merge changes I8ae4e331,Id4e37c3e,If0fd4834 into oc-dev am: e422bc0c8f am: 43d5e3bb62

Change-Id: I5df542202c561a4ed931b918ccbaed317a8ba942