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

Change-Id: I9bf2c56d421a8695db93a1e467e8a4e9316e9165