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

Change-Id: I06c617a53d23b6c83c7f4fccc92b423eba8e562c