am 248c9aa9: am 2769ce79: Merge "Use accessor to read property serial numbers"

* commit '248c9aa92c8f3e2f33a0e8a02436ea366266495f':
  Use accessor to read property serial numbers