Merge "Wait until any background events are processed." into stage-aosp-master am: 0589325300 am: 8cf1cab8c4
am: 120715a56b

Change-Id: I1a0a379061ba3e2d79d1f0600a400167ae8c74eb