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

Change-Id: I2deca8c2fd6347cfef6e000230a4860bcb17bd6a