[automerger skipped] Merge "Generate /etc/{passwd,group} for all partitions"
am: 6722de12 -s ours
am skip reason: change_id Ia85abbeefe5a945369970f2aef42692e07ab8c09 with SHA1 6cf1b11e is in history
Change-Id: I1c6a2507d03c6b030415611acc9f14808c9be002