Merge "Merge the changes about the tests repeated setResolverConfiguration"...
Merge "Merge the changes about the tests repeated setResolverConfiguration" into rvc-dev am: a40187cf am: c678b944 am: 7a2fcad9
Change-Id: Iccb9b0ebbc8f44e40c519c0c99a6b1eb766e728d