Avoid breaking internal code when AOSP automerges to internal. This will be reverted after fixing up the uses on the other end. Bug: http://b/35858739 Test: treehugger Change-Id: If1ee03d8d7c218d3ad9f451cfe9a9077753dda02