more CR feedback, again

Change-Id: I283d2f5cfd7c9a4be98369a862075f233f9aad02