Merge "Remove an unused code path"
am: 7a73a2c84f

Change-Id: Ia4c96bf0a211a2108e4d02fed979a2ae42ca5961