Merge remote-tracking branch 'origin/caf/caf/android_ui.lnx.2.0.1-rel-base' into android_ui.lnx.2.0.1-rel

Change-Id: Ia039ca065c1fec96898fc5e4077216c6d2266acd