Import c9a1e56750a4eef6ffca95f41f79f06979056e01 into master

Change-Id: Ie4c4d87c11b14e8795d1a305bda1d27c6228218e