Merge "Added BUGREPORT_OPTION_TELEPHONY." into nyc-mr2-dev