Merge "Followup to CL 1103896" am: 54bb8a1625
am: 23d581fe2c

Change-Id: I7625bcd13f7ce9064e71645d21af39e8034d1a11