Merge "Fix batterySendBroadcast not synchronized issue." am: 32e756a4bc am: 15df815e1e
am: e5a3ad23fd

Change-Id: I5c95a68b758730839309d9c7fde0ecc6415b3f83