The day has gone. Still keeping the code as the schema changes are not done in production but the data migration has been finished. Bug: T299417 Change-Id: I906e069a63d1dae14924c72318b22b16244371d6