Merge "A few cleanups." am: 0c22c5646e am: 35f2bf43a7
am: 55ed67cdaf

Change-Id: I97ad96045e8709f485d49cd598434a9fda2497b1