Merge "Pre P apps can't change new fields" into pi-dev
am: c11cb1b151

Change-Id: I9f09a5932de931dc8e7414f9dcd57b89a121d82c