Incorporate feedback from the Initial commit review

Change-Id: I1dae74e216f5d08da2eda73245577be3dc31ec34