Change-Id: I9d3cb23e4ea692f737a3e3d6c18cc8de18b66a3c (cherry-picked from commit a98121ef5251b5ebdb8c1b0b6780d570844284b2)