Address comments from aog/1180224. am: e3f775bace
am: 54288bb9e0

Change-Id: Ifccd75520efcaad4eebfb1ac5da763ac2a06f76a