tree 219de5b111f8e80a0960421753dc8cf00feb1310
parent 1370a300f2db1debe069b975ed5b7da368746e2f
author Alex Van Damme <atv@google.com> 1559323862 -0700
committer Alex Van Damme <atv@google.com> 1561511443 -0700

Fixes to make 4.14.98 compile

Change-Id: I06409926a74b69c1bc25b19574370e91e01dc1c2