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

Change-Id: I4aac670e32eff146e5d85b470474c4927d3a4845


Trivial merge