Merge "Parse "Wait for property" duration from dmesg." am: 5775f059d0
am: 6483d06252

Change-Id: I54e711820a3f8c37d553e68252b033b838833116