Fix field visibility issue in alpha4

Change-Id: I98cd77eb7443f83e86ef1101c27cf70b99d0db99
12 files changed