Merge "Add debug system properties to control profiling limits." am: 1db3789252 am: 329e12fb57
am: c4df73c1cb

Change-Id: I4b731d3e0abcd692876d20ebe788d5fc14681bd3