Change-Id: Ia551544b1c68fda19a7eac505251ca1146b355d2 (cherry picked from commit 5e295d177ff135d9824cefb1d44c97820611cf01)