Merge changes I7f00c5f0,Idc18f331,I1e7d3a88 into oc-dr1-dev-plus-aosp am: 08adddec07
am: 009c13083a

Change-Id: I1accbb36d96fe4c45411a8639cab37e55be56dbd