Merge "Use make functions to convert a text to lower case" into oc-dr1-dev
am: c74abeba1f  -s ours

Change-Id: I8d56a2fc9d5137f7416c99eba7df77a7ab129d35