[automerger skipped] Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev am: 9a73912aec
am:da439d4abb-s ours am skip reason: change_id Ib2e0c05575d07496792188716b962ca622df28e6 with SHA1f55f5d83deis in history Change-Id: I25d958a9a511bb145f372f7c6b4d1cfa379456af
This commit is contained in: