Bug 1457867 Change-Id: Id9e18b0341589026bff1b67357ab56a667ef3b26 (cherry picked from commit 951ac53f)