Merge "Alter StoragedDumpsysTest to accomodate a timing issue." into pi-dev