[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 -s ours
am skip reason: Change-Id Ia84d8e1162ea0b3f4c6afe87e63db56256236940 with SHA-1 4fc1e2c4 is in history
Change-Id: I5da77bc975c5ae62f11044d3956b85938d4b9a19