cm-10.1.6 without HALO

Change-Id: Ie550e2a4761e5105782b4a01e74b3acf16438c14