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

Change-Id: Ifc47ccc698724f6222f2f7b9beb984e0cfdf3c21