[automerger skipped] Rename ResolverExperimentalOptions to ResolverOptions am:...
[automerger skipped] Rename ResolverExperimentalOptions to ResolverOptions am: 05420811 am: 89d15a6a -s ours am: 1217f53d -s ours
am skip reason: Change-Id Iaa75e8028e98998eca4c9b821aa07effab19dac3 with SHA-1 a6ac2a6e is in history
Change-Id: Ib0523f2fdfbe31c9505b37cb24cd6b64d6b96904