Merge changes from topic 'am-5efdd8bbd86a42118789e95a7f0799a6' into oc-mr1-dev-plus-aosp
am: 9bbf911f25

Change-Id: Ifece413bce768b100ac101be9335e44edee1e7d9