fixed minor code review issues from change I0280c3be
(it was submitted early accidentally)

Change-Id: I3753366b4d5e1dc228baf02eba27a2c0d8fa42cf
5 files changed