Merge commit '1cdca19443393214cb44188cf779fd8a3faf35bb' into HEAD

Change-Id: Id0d01e4b97bd7c925e4daa2c0d995cd8ac90a243