[automerger skipped] Merge "Add option to toggle all changes" into rvc-dev am:...

[automerger skipped] Merge "Add option to toggle all changes" into rvc-dev am: e57cfbae am: 42b7c290 am: 04d74376 am: ece8a640 -s ours am: 096a70cf -s ours

am skip reason: Change-Id Ia84d8e1162ea0b3f4c6afe87e63db56256236940 with SHA-1 4fc1e2c4 is in history

Change-Id: Id84f64c88ff48e61369b4c6109346620cedd8709