Merge new commit into motorola repo