Merge "Minor clean up." into rvc-dev am: f0298c4672 am: 8aa5048ff2
Change-Id: I7c0333672e79f6ba4787de1ed236806bfc1c6ab8
This commit is contained in:
f0298c4672 am: 8aa5048ff2
Change-Id: I7c0333672e79f6ba4787de1ed236806bfc1c6ab8