(cherry picked from commit 7945ee46591ceba584b1b2167e5f750d3489d69c) Change-Id: Ie71a8745e8810ade310103fdfed7db03cd170980