Change-Id: Ic25d31ee16f65a638ecb8957636ebfdb9beb4eb7 (cherry picked from commit fd224b97797dfb7e3ee1e2f56c3109d1594cf040)