This potentially helps the following issue. But anyway, this change is good to have. issue: 3292648 Change-Id: I0ad74b802d7ce2c3d66de8115187638f1d5e72ff