reflects reviews

Change-Id: I7b24a230bc57e966a65aecb4f0f0f7c391f8279b
9 files changed