Merge "Address missed review comments."
am: 4ca07d1e80

Change-Id: Ica5403f5b030b9334d6c41421091d8dc9c7f645d