Change-Id: I0ee1ca89fdc859d75a89021ca8c1902811b1e4a9 (cherry picked from commit fb17b32550de624b7f476b70b7a2fc77f31dde7d)