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

Change-Id: I51d74fee535d916c1c160d5e1fb68c350e6e4ef7