Merge "Fix blocked number edit text direction and gravity" am: b6557e58cb am: 7e525ad237
am: fe47dbb9a0

Change-Id: I4fc2d4916387daf09b695dba1fc1315feee12aa4