Merge changes from topic 'debuggerd_snprintf' am: fefda6b508 am: 8de67e537f
am: e5b6b89908

Change-Id: I4d9ec396dabfeab1a7b343c784a1c068cd036c96