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

Change-Id: I0122af5a47614972dd5ba696f8a22bcae2625a1c