[automerger skipped] Use TransformRecord to get SPI instead of SpiRecord am:...
[automerger skipped] Use TransformRecord to get SPI instead of SpiRecord am: 963502fa am: 9ed0f7a6 am: afb93cca -s ours
am skip reason: Change-Id I1959f3080946267243564459ff4207647922566e with SHA-1 963502fa is in history
Change-Id: I18fed3ae8ed4291372500ee1010efdef217161c6