Merge "Some of us are weird." am: 559d6018b6 am: 99c3f55c89
am: 9007b5e977

Change-Id: Ie403557c8295b7d708ffcb0fbf800e8ac27f31a7