Merge "Address comments on change 45d26c86b00580593067ca42091ad66cf7dc4f7c"