Merge "Make side change for prod override vars support."
am: 664b72abfe

Change-Id: Iab7568f9b8f3cb954aa0cb26728393f8ddd80016