tree adba08d22fd4778f09e9f6794ecf183a7fcfa489
parent 8992290dade319f6089dff6f28a164925f9847cf
author Andy Bavier <andy@onlab.us> 1512601577 -0700
committer Andy Bavier <andy@onlab.us> 1512601577 -0700

So that cherry-pick of patch 7431 will work

Change-Id: If6714771fbd3a23c42f9810c2e3330d0b648a65c