Code clean up

Test: Manual
Merged-In: I5b3620d1ae807455f3313b1564181f95b1202d46
Change-Id: I5b3620d1ae807455f3313b1564181f95b1202d46
(cherry picked from commit 8cb5d156450958139e29c1280281ec750a00a7e7)
2 files changed