Merge "Check only what's needed and use threshold" am: 923d047106
authorCourtney Goeltzenleuchter <courtneygo@google.com>
Thu, 24 Aug 2017 23:19:28 +0000 (23:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 23:19:28 +0000 (23:19 +0000)
am: 7fd5af1735

Change-Id: I2663d7c9638d0040dd8a500ae0aa8090844e578b


Trivial merge