Merge "Add system property for hot startup method threshold"
am: a370159592

Change-Id: I271cf74364b7b9c2d16282ef6a9ab24b6d243e1e