Change-Id: I3a1c7ac95cb4908065c8edc8b38f8304c44c96b7 (cherry picked from commit a8d06b20974e2d3f9d3b8d04e44c021463311155)