Because of a broken patch series we add this patch manually to the stable branch to fix it. Change-Id: I2581630531ad227e60e8b376e807a1580a81989e
Because of a broken patch series we add this patch manually to the stable branch to fix it. Change-Id: I2581630531ad227e60e8b376e807a1580a81989e