am c58e4f42: am 06acf91f: am 3b85269c: include build timestamp in OTA metadata

Merge commit 'c58e4f42ec27f81cd72d3e5872fd65e13a8e4213'

* commit 'c58e4f42ec27f81cd72d3e5872fd65e13a8e4213':
  include build timestamp in OTA metadata