[automerger skipped] Merge "Fixed that cache is not in sync with subscription...
[automerger skipped] Merge "Fixed that cache is not in sync with subscription database" am: b2487773
am: c1b99d5f -s ours
Change-Id: I02d55dea489c01738a302dda127d971e1b83070f