Merge \"Workaround for incorrect EXTRA_CALL_RAT_TYPE in vendor code.\" into nyc-mr1-dev
Tyler Gunn [Fri, 15 Jul 2016 15:18:09 +0000 (15:18 +0000)]
am: 4effdca336

Change-Id: Id0880cbe800ac79cced9c91992bf72873e74476f


Trivial merge