Merge "Use make functions to convert a text to lower case"
am: cd46f1012e

Change-Id: I737210f72379b1c77e8568556a1185bbc0c6bb16