Merge "Address missed review comment."
am: b2aaf1d63f

Change-Id: Ia215689e4d5306726b02f94bb905dc92230b5abb