Merge "Followup to CL 1103896"
am: f8b0fcbc6c

Change-Id: I1eb784a8266880260d75ca109c7d78f180333a0e