Merge commit 'a40954fd' into HEAD

Change-Id: Id05ffa03c78abcfd52aa040397bb512b41501029