Merge "Opportunistic typo fix" am: 6b03498a54
am: 99cf81acac

Change-Id: Ie1909cb93fa6ed28e8d43a6a3849f5b4d8eec861