Fix field initialization error in per file compile. Change-Id: I97b22433fb5a24f8d8fbb2be7f3447f7e1581fa0