 * Hotfix for bug: https://issuetracker.google.com/issues/64434571
