phab - small lint fixes

Change-Id: Ia9647fad8ba2fc4ee85c8281b6256426a02e542c
Merge "phab - small lint fixes" into production