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

Change-Id: I65ce944f355a836812d78aa4782226635dae2a3b