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

Change-Id: I7a1123ed362d884dfbbee21c8e04595e55844ecd