Fixed outstanding issues from 3 previous reviews comments.

Change-Id: I23de8a756003e3f065c910c6dfffcd560a1f10b0
Merge "Fixed outstanding issues from 3 previous reviews comments."