Merge "Opportunistic typo fix"
am: 6b03498a54

Change-Id: Id6dc12172a9fb1980a598ba070af1b10b1738849