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

Change-Id: I98468056a3d6c720c48bdb6941d9b0f9def9949f