Address review comments

Change-Id: Ib31f602bad329c01e8be57650663eeb82cec85e1
Merge "Address review comments"