Merge changes I8953967a,If17eddad into oc-dev
am: b8abd8d867

Change-Id: I9d2462aa708a67d4a9fe4d5cde477b9f14e8d204