Merge "Comment Pending JJB Changes on Patchset"