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

Change-Id: Ia530cc2cdf583baae825386a52fdb8eb3763d99b