Merge changes Ia6646363,I94389b64 am: c4f78f6100

Original change: undetermined

Change-Id: I5ba9dd64f2b8d01925a574d0361430aabd6f7f4d