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

Change-Id: Ia82dbaf01943f29d4f50cc133137b62184b15860