[automerger skipped] Merge "[MAC rand] Avoid null Object of mac address" into qt-qpr1-dev am: 8d265d43fa
am: ffec48661c -s ours
am skip reason: change_id I914a2678e62f1e2ef6dc1b358a76a306b9cc0cc4 with SHA1 2b50f4848a is in history

Change-Id: I5d41a0e0ecc30fe65d58b601f55da6f5a913c283
tree: ad6322bd9a8083c1b803896b5a49d9ef94aa1892
  1. service/
  2. PREUPLOAD.cfg