7699318ecd
Merge commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7' * commit '1e3d1b4b83452286b000b8cd1997e5aef97fe2a7': Motorola changes from 090602 through 090605