Change-Id: I82e409f0d3649a371cbe0f8ee9a5f9ad1a267fc8 (cherry picked from commit a5bb7694cf874f125ee9d1169d20710fd4a27443)