Allow hacking 0.6.0 and fix errors from new checks

Change-Id: Ie9f628fcc2ccb34b50abd401a514b1602c518f58
Merge "Allow hacking 0.6.0 and fix errors from new checks"