10.1.5

Change-Id: I237b8d0480b1becf17ea8cd859eb97ac0fc64ac8
cm-10.1.6 without HALO

Change-Id: Ie550e2a4761e5105782b4a01e74b3acf16438c14