Merge commit 'd46898c8140f23c74ef612773227f7d1840ee02f' into HEAD

Change-Id: I6726121d22b8f23159ea6632da72cf330149579a