Merge "DO NOT MERGE Fix error where androidx targets were being used." into pi-dev