DO NOT MERGE - reconcile open-source variant

Change-Id: Ib8297477936d8d6d6515f38813887f75a663a7f1
4 files changed