Merge "DO NOT MERGE Fix robotests for AOSP"