Merge "Get account features before taking lock (cherry-pick from master)" into...
Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev am: 2258e5fd
am: b53de541 -s ours
Change-Id: I983a609fb5c6ae9d4f13652fe7172546cf46c719