Merge changes Ia0c5e920,I71e957db am: bdd03448c1
am: 3741c0449e

Change-Id: I18025512921f59040fda4ced5c57e0bfe7ead19b