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

Change-Id: I75466614fdd2704ad09e400a5b9b31597f048237