Change-Id: Iff34e4543d50074db05280fec8178029c4531e00 (cherry picked from commit 6f98eda25c722ecb6e0b6f4926972031c00bc366)