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