Merge "Set model_id" am: b090a8e
am: e3064aa

* commit 'e3064aa2b62176a936c5749dea1a364fcf04c203':
  Set model_id

Change-Id: Idf2589de4a906cdf4ed3dfaf98f198037de84bd0