Change-Id: Ie5f4c6ab8debf1a2b11db45b0cb6957e2539ac80 (cherry picked from commit 40bffd6293c1d33acf397fd338b7f04c4d13b156)