Merge "Some of us are weird."
am: 559d6018b6

Change-Id: Icf919c902d9a7e5e8eda1ac2e7f551cf51891281