Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Fix firing pending "..all.." events on startup Change-Id: I04f042199fd8935bee987b8363956115a40e0872