Merge "Deprecate KEY_IGNORE_RTT_MODE_SETTING_BOOL" am: c6ec27d2d4
am: a7d6573987

Change-Id: If0c13c830bd68343a2ad02149e2d2b13c009f1d4