Merge changes Ib4683497,If5d68c17
am: 428628891f

Change-Id: Ia00233651eb54d865df1a70b05bad6e6d79ccef5