Merge "Fix CarVolumeServiceTest failure." into oc-dev
am: 6d7ffcd4b5

Change-Id: I17aa654c4bac4fc6d726f1eb60fa1f67a66f3f5a