[automerger skipped] Merge "Only update subscription cache when profile list...
[automerger skipped] Merge "Only update subscription cache when profile list is not null." am: 58752cac am: 05504e28
am: ec7b4c01 -s ours
am skip reason: change_id Ided94635e4ac5ee1f3465e61ec83e6b8ed7a6234 with SHA1 69e439f2 is in history
Change-Id: Ia5af8f0ec4d816843bec46aace4848373edcb86a