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

Change-Id: I60b54cedcc42953045cba57a708f691e57ccd832