tree 8e74ef6cf9bf17bd63dc57e15c92f8ac5125c694
parent 4024cff0fe90faa1eb07944b02f2516368322a1d
parent f0ec3f4a915f26ce855e920014f0298db12610e9
author Neil Fuller <nfuller@google.com> 1500993503 +0000
committer android-build-merger <android-build-merger@google.com> 1500993503 +0000

Address post-review comments from xTS expert am: 3c4897a73d am: f9264c042e
am: f0ec3f4a91

Change-Id: If89e632001c8bd546735272d74f08ade6b9f33e7