Merge "Address some comments for aog/333864" am: d458d08391
am: 7d3000e320

Change-Id: Ic2cc00b159ee6e6751be6f73d3e9bf5a0a565268