Merge changes I4e32a588,I202c5653
am: 003ab94333

Change-Id: Ib993592d06a8956770623c3712367275cbe0868a