DO NOT MERGE: Restore accidentally reverted mustpass .txt changes Bug: 24913373 Change-Id: I78dfb9f7518d78aaf0622477670dfee46e13a6d7