Minor cleanup - DO NOT MERGE

Orig-Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
2 files changed