Work around/prevent NPE in aclStateChangedCallback.
am: 0ce2c58515

Change-Id: I21751c40fc3e332e350f00309458c4c92004dcf6