Merge changes I46690d1c,I84c11aa5 am: 0dda322d4a
am: 18b23afa4b

Change-Id: I4f46e0285af613f12c533f1235d75887aca19e3b