ref: a349ee3bf5defedb030561007ce7a69717cbb103
parent: 29771770c1298fdd2b54c1ad6eb0af98aaf7c22a
author: Deb Mukherjee <debargha@google.com>
date: Mon Oct 13 10:27:53 EDT 2014
Resolves some lint errors And also fixes some style consistency issues. Change-Id: I3dc6d44e17d2d6075dc9b02c4255a7395046c5e0