Merge "minadbd: More allowed properties." am: 1ef7f92871 am: 6c37304201
am: 9b2cfec8dd

Change-Id: I9f8a5adacd97e02a893924b8d450ac994df37015