Merge commit 'effd7b5ba93f752abe87c0def558d64e9b88b2ef' into HEAD

Change-Id: If1751d881f28c00343197ff14e3c98bdc342fe81