DO NOT MERGE - Skip RP1A.201005.006

Bug: 168212094
Change-Id: I8c314e1371ad0af1f1deac81d5296cc98e176255