Merge "DnD: Total silence doesn't suppress A11y" into oc-dev am: 9f1494368b
am: 9a68e9b2ef

Change-Id: If166dfe2f0f087c349a488f0eb8bdfe462ae97b2