Merge "Reduce quicken info size" am: da914e73c2
am: e31106a4bd

Change-Id: I6d29ff4c3e085e8eb01e9f0a6e0f2eac1c8b3baf