Merge "Total Silence vs VoIP" into oc-dr1-dev am: 92e1d0ab44
am: 44e6126079

Change-Id: Id9096436fc8d10f672777b31e40dd8e121faa418