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

Change-Id: I772ae4e186332d1fc13a694c3c7e61fbbc6ac1d3