Merge "Fix test for handling volumes of MediaRouter" into oc-mr1-dev
am: 5ea5ebb774

Change-Id: I3d9089f16ca47aeccab592813557a57a60bb9bed