Merge "Fix criteria to decide should next GC be minor" am: d0c3a6cbc9
am: 998f78aa8f

Change-Id: I037d249fb337a0ac065d2508f6ca672c7fcdb52f