Merge "Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: should use minVol instead of hardcoding 0/1" into nougat-mr1-cts-dev am: f781ac8c4f  -s ours" into oreo-cts-dev am: c5094c93fe  -s ours" into oreo-mr1-cts-dev am: 1bea775dc0  -s ours" into pie-cts-dev am: feaf5e3809  -s ours"