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

Change-Id: I82b8d2e5d5246cf41806e0530db67cd779ed9b37