Address comments from aog/1180224.
am: e3f775bace

Change-Id: I60414dc7da0775d1e3a1a65a1598421b12ce4692