Merge "Bound pending write events queue to avoid OOM" am: 6cbd36f357 am: 797b06e220
am: ac564f2899

Change-Id: I09b08508fd3cf53381d524613dad63621eb63595