Prepare infrastructure for resource variance

Change-Id: I4a01afe4774e6c672dfe75503607cb9ea144ec70
Merge "Prepare infrastructure for resource variance"