manually updated

Change-Id: I3fd229711a2847abab0cd86e83bb0837cc04d5ec
Merge branch 'hotfix/h1'

Change-Id: Ie14d43f9cc082dfbc999f311f559714c321376c5