props for jflteusc

Change-Id: Iaa7a8341d50909761ee0aa947cd84e6dea407310
Merge remote-tracking branch 'cm/cm-11.0' into HEAD