Some fixes for comments and implied conversions.

Addresses comments in:
https://android-review.googlesource.com/#/c/89148/3

Change-Id: If21cfaa541210c8702371efd1e6d4f071a7b9ec3
5 files changed