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

Change-Id: I7723ff61f7c0f6f5f0bf560b2baa16ffda85dffb