[automerger skipped] minadbd: More allowed properties.
am: 7a31ab675e -s ours
am skip reason: change_id Id4667fcaf0e908c391085b22e22c957acd01d9c4 with SHA1 3b9ef341be is in history

Change-Id: Ide33c9019fd42d5d44601f6517db945e8e1514ad