Bug: 17440886 Cherry pick of bb2d0cc7e1d487f7021b1f9ec0c6740e41b535f2 Change-Id: I78f25cdcfc49cc6a142a51b8aab009c37be8e6de