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

Change-Id: I0e23e30c6f5f29b6df50ec9dab0707c3ce73bfb4