Merge "Always send all available state when calling onAvailable()." am: affbb8b6a9
am: e0a62a4398

Change-Id: Ie9bd779526e967790cbc51de52a64bbf7cd493a5