Promotion of android_ui.lnx.2.1.c1-00018.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------

Change-Id: Icb939779d3754385b03f10aa31111b2413d78aec