[automerger skipped] Merge "DO NOT MERGE: Disable failing test." am: 3a54f81a36 -s ours
am: a3a404bba3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifed8606864cceeb32049bd7eb490cf0f1fe05580