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

Change-Id: Ia597356da7fe6019da37bf611038eb3448f0cd34