Merge "[DO NOT MERGE] While-list apps to access account if already saw it" into nyc-mr1-dev am: 4edd9dd249 am: 7b18dfa1fa
am: ce39d6dda4  -s ours

Change-Id: I59f1e571d93c62a2a329978dc3c1b39e3e54d832