Merge "Address post-commit review comments" am: 858634e4ec
am: 5c15f6d6b1

Change-Id: I967e815611149c2fd9b6ca39e9fcf9eab3b23771