Bug 1390644

Change-Id: I87a3473ad7923cd82a8af0878fe73196686ff395