Link to the bug motivating the #defines. am: 03e7a3eae6 am: b1953bc192
am: eb4f490242

Change-Id: Id9c15320a019ce947caf2bf4f8d5b5783fc61b5d