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

Change-Id: I7648fba978a44d421021e4a7e4a821ebf3ef4b38