Sharp branch?

Change-Id: Ie45379f81501026ea57116c0a4b73622f1820df6