Merge "Minor post-merge cleanup." into cm-10.2

Change-Id: I2750004fb53e4640f679ec33660e0c60fe5bfbd1