[automerger skipped] Merge "DO NOT MERGE Fix robotests for AOSP" am: 51b6c76660 -s ours
am: c4d53ba7f3 -s ours
am skip reason: subject contains skip directive

Change-Id: I1f3a2bb325bb5870101b70206879c02ae2077683