am ff3c365b: am f5182163: am 11f82711: am b169e271: (-s ours) Fixup a few things pointed out in review.

* commit 'ff3c365bcb6a5be4216b272282eb5c599c4d9802':