update to 2.x models

Change-Id: I341d160d53c0870c271d37c9207abd577876505c
21 files changed