Merge cleanups

Change-Id: If93351fa896c82d2c13e942031598e1866e19ea7
4 files changed