Merge "Route speaker via speaker and headset when tapping speaker button in NUI VM" am: 2b22f7d618 am: b4d2da8edb
am: 17c67d66c3

Change-Id: I1f7209e0fb479d00fe4b9d82af6dd583b521e223