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

Change-Id: I2299a5f77b2692ac50407459ca62f882af831e25