Merge "Merge "Wait until any background events are processed." into stage-aosp-master am: 05893253 am: 8cf1cab8 am: 120715a5 am: 11172539"