new commit on hotfix

Change-Id: Iaf534ae0bc7766867248af9cf961d22ec9b13e9a