* We weren't updating the account object passed in to setAccountPolicy,
which is problematic if the object is cached and used subsequently
in the code (it would have stale policy values)
Bug: 5245056
Change-Id: I279570dfd66c4a65d751f73e2e56578be186d339