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

Change-Id: I6efc7c8201c57932d6cb5ff4f5f474592e6d01db