Previously we omitted these fields. (cherry picked from commit 0adc90eb) Bug: 20726205 Change-Id: I81c55919a4bd015bc0a4e7259a41a05dab534e11