am 4700fed7: Maybe this will silence http://b/2460740

Merge commit '4700fed72b619a09a0d9cac93e86625b95c730dc' into eclair-plus-aosp

* commit '4700fed72b619a09a0d9cac93e86625b95c730dc':
  Maybe this will silence http://b/2460740