Merge "system property: property set without time spent asleep"
am: 0f65650859

Change-Id: I902193d830e94fa9bb4032768d980487224f45d3