Revise previous patch based on feedback.

Change-Id: Ica39399d35c961e13cf401784ce024b6f85fe00a
1 file changed