changes for NamelessGears

Change-Id: I91ac5f15b8a6c200e9dab0e8627ffa472d8c7501