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

Change-Id: I3ae3b91303cb13be200a6faa7151a1474db13c68