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

Change-Id: I8449bf0937babd6344d79ce857b88c3ec1288481