Merge "Fix a11y volume not always being shown" into oc-dr1-dev
am: e060044217

Change-Id: Icee419c23ead54f5e0764b9a4cfc3d7f1517ca17