Random cleanup

Change-Id: Ife6f19d51e8229b6cf1ca8689df7baba2fcb4dc9
2 files changed