Merge "Fix broken target SDK checks." into pi-dev
am: aab3304a22

Change-Id: Ib43fd6704d6982104f11504b3d43db9edcfa9d41