Merge "Perfprofd: Fix zero-second sleep" am: 48ecf72575 am: 7f03f9dd65
am: 695b13e845

Change-Id: Iad7873a8878054c8ee6d10e8a7eaa4a767cb2850