Merge commit 'e5f55a1288899c0051a597d9b1ac03a87d65f4c9' into HEAD

Change-Id: I7f4cb6ca0e44a2ac2295cd8abd2c131bde69fd87