Address extra review comments from commit dfb325e0. Change-Id: If76e81e7af5870431901de0bf561e0f827435fe3