(re)declare versioned attributes in mapping file am: 1fd1f27bb3 am: 77fcc9d929
am: ccaa5b523c

Change-Id: I3a7a2ceb4ba99f8164415ac43a6f3d50e8234459