am d40130ab: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev am: 76fcb627ae

Original change: undetermined

Change-Id: I352856ed9b078cb01b621a8ebd48db70de11d487