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

Change-Id: Id56adbe39e8a81ef12c4b9d8fdcf65c94a316d6f