[automerger skipped] Merge "Add option to toggle all changes" into rvc-dev am: e57cfbae -s ours
am skip reason: Change-Id Ia84d8e1162ea0b3f4c6afe87e63db56256236940 with SHA-1 4fc1e2c4 is in history
Change-Id: I2eb3c751c5e16d2e72610b0a75297949870f68fe