tree f3b3f449db9a605051bb80030cf8c9e2b2c1129f
parent 10d14a9d4b16aba02867f65cbb9849f167758271
parent 0680256d7fb24028a57297e9888e9d7d6a1134d2
author Neil Fuller <nfuller@google.com> 1556195946 -0700
committer android-build-merger <android-build-merger@google.com> 1556195946 -0700

Merge changes from topic "tz_format_version_4"
am: 0680256d7f

Change-Id: I73cac7c13ca75d7645c10ff36f78196592baf7c5