tree ff92d0182a0d014c157c836933c870e32d4fd2e1
parent d61d501a06793d2914e087140bd1350acac1a16e
parent 86d1eb9b4b246ef9775b16c1c538ba5f6becba5b
author Makoto Onuki <omakoto@google.com> 1483556667 +0000
committer android-build-merger <android-build-merger@google.com> 1483556667 +0000

Get account features before taking lock (cherry-pick from master) am: fd24353d75
am: 86d1eb9b4b  -s ours

Change-Id: Ifcde7fa530cbdac037d068342a72bdff765a6a63