Merge "Address review comment."
am: 77ec0071cf

Change-Id: I0b40813d4c40e104ee111c45e13d6f278e6d705c