Merge changes I7f00c5f0,Idc18f331,I1e7d3a88 into oc-dev-plus-aosp am: 8f3f53f504  -s ours
am: 082798acba

Change-Id: I0846d74aa63214a9ea67b13ac5fd988cda6f3903