Merge "Do more GCs for test 141" am: b68e12c7d9
am: cd59eb493e

Change-Id: I5c725df80919b0bfc6d36ea4724d92eac47a01fe