Merge changes I866fe138,I0096a2fc am: 17a0b4fcdc

Change-Id: I84f8a65bc8486d130cc9ebcbd519d488f4b11869