Change-Id: I164d29c79cbe469d8b0fc55c45d7f9d2322528ed (cherry picked from commit 59b77168ff91a83b8412fc7aafebc1ecb2f6470c)