Fine tune parameters

Change-Id: Id24ccf21552ce7cdcfdc109ede8ec10221e4620b
Merge "Fine tune parameters" into cm-10.1