Change-Id: I5f5d52cdf7aba4ac09684aab573e6916dbad183e (cherry picked from commit 6b88cd1901a65b977fed759e322dcd75a2cd33b6)