Merge "Add deprecated field" am: f157a2adb1 am: 6c64bc24e5
am: a88bc8954a

Change-Id: I73be9b77e6fd937b3162208a742c5d40457582fc