Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev
am: 9f401d66a6

Change-Id: I5d3cda45aa842f4adaa50163146f616776848130