Merge commit 'b678a5324877a24163655fb256ae0c835c5fd1f6' into HEAD

Change-Id: I6ad0d4acf226ab76264b09b6b3626037d2b41068