Merge changes I71e70d6f,I40955c6e,I70ed303b
am: 602563008a

Change-Id: Id638a81dac8a934f04f024cc24ee26d8b9c4228b