Merge changes I01d32749,If3540c3a
am: c18ae710ae

Change-Id: I500778eb04c715647db6a27abc5ae3ae37ce79bf