Bug 1447865 Change-Id: Ia4b09ff1bf379421f1fc1b77de07d86353569452 (cherry picked from commit 5fa788c0)