Change-Id: I2974ff7c3f7e753239718f9bfd8b4977672dc651 (cherry picked from commit 9f3c98dcfb8801fe70e9dd02f0f931be6c5556be)