[automerger skipped] Merge "DO NOT MERGE Fix robotests for AOSP" am: 51b6c76660 -s ours am: c4d53ba7f3 -s ours
am: c745b59945

Change-Id: If7f8eef3f25311bb3df68d0ead2aae2db0620d6f