more CR feedback

Change-Id: I46b76e684bff42fb2fe2f83ea99145a6d3e76cfe