Method parameter type hints

Reduce some else indenting

Change-Id: Ic0e81231e5e9f86946b984f03d495e7f08014c1b
Merge "Method parameter type hints"