Merge "Add version attribute" am: 5dfc73b9af am: 755044bdab
am: d328d2c04d

Change-Id: I4043d1bf70244fdf63e6ed099a794cb9ea49d024