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