Change-Id: Ie42486b33683a72337d11f073f3b272c671ebd94 (cherry picked from commit b47062ec3c97c5c604c21b56389831d4a7fcc295)