Amend: Added comments and cleaned up preference store Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d Former-commit-id: cc34e3dbebe13ec4f63b7529f5053391135837ef