Bug: 298231234 Test: manual Flag: NONE - xml flag not supported Change-Id: I7ee9de3bddaac8578b639f091d6bbbf3ae458fd1