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