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

Change-Id: I61da77b9d380ecc4a552aab1138de0c838dfb401