Merge "Fix minSdkVersion for test." am: 08b2412696
am: a463709641

Change-Id: I759bd2508e52906284e4ad8b7d49796975bcece5