Merge "Fix some potential power-draining race conditions" into cw-f-dev am: efc2c764f1
am: 1f817c61cf

Change-Id: I7023d1196fe30a7c18501cd401a0305241b8d2ea