am 6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.

Merge commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp

* commit '6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
  DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.