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

Change-Id: Ie8a8355cdddae18345ac9c2975ddddb6160f94be