Bug 1464477 Change-Id: I016d35f35406f4b1c7bcb298ae2966f1d37fed05 (cherry picked from commit e7779d20)