Merge "Get account features before taking lock (cherry-pick from master)" into nyc-mr2-dev
am: 2258e5fdb9

Change-Id: Ieb15cc47f1db3ff805a91615d64bbe2c23d914ea