am a2a5ce49: resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp

* commit 'a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2':
  Remove Time from CreateInfo