Change-Id: Ie69b2cf96dae95b6ebe7b7797d3755749aec9f35 (cherry picked from commit ebb47950f21d3c41955a591000dfb1f195e746fe)