Merge "Address property service DoS." am: 8d302763ab
am: 811971d949

Change-Id: Id867417dc6491af129151cde91913a0d0208ebec