Merge changes from topic 'o-usage64-2' into oc-dev
am: 441c1cb7d7

Change-Id: Ia157cdb20c55ed30f3b6de49be3b67b3410910d0