Merge "No-op flag to keep tests working in this branch." am: 2144164526
am: d6b5de96c2

Change-Id: I4da35d7b8273c20fe625ea79fb135e4d59648e72