Bug: 113554482 Test: old tests pass, new tests added Change-Id: I2e93c88c30eae614a6db04abe698e8edf7fa6a43