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

Change-Id: I88ec73ba4613dcb4a309b68f9635f07c652e3807