Fixups for CM10.2 after CM11.0 branch merge

Signed-off-by: Sultanxda <sultanxda@gmail.com>