Merge changes from topic 'am-de733d91cb0341aeb2ef16f880922bbc' into oc-mr1-dev-plus-aosp
am: 1fdd206583

Change-Id: I9db451926e0ca73747cf15ce163bd4c4fd708f80