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

Change-Id: Ie8c749bbefa05cae3f5104be30dca0f08ae0a2c1