Merge \"Update UI style for GLIF buttons\" into nyc-mr1-dev
am: a028010c23

Change-Id: Ic19e5d4909fbd7c2d7841e12cfec29b264d144a6