Merge commit 'refs/changes/61/14061/6' of git://git-android.quicinc.com/kernel/lk into clean_tip