We were inserting value field after the Object field instead of the String fields. (cherry picked from commit c94c6a75) Bug: 22043800 Change-Id: Ibaddbd7299562949e32eceb625feac325539e3ce