Merge "Read build flag to determine user model." into pi-dev
am: 9b5267f914

Change-Id: I08c8e72fdbad7b20ac6039c441feabf2ac31205c