Add support for lovely nicki

Change-Id: I040fb942ab0c812b238cb46a4188c42c547b3825