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

Change-Id: I35f8d544504bcf80b8d96f34b9416b8d9748180b