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

Change-Id: I4f3bbd22c853b7fcb6f52e7e0543fc63712bfdbd