Merge commit '28d6d51c466eeaadf69c7a783a6e6c717374c436' into HEAD

Change-Id: Ifdca8f7d08745da4863750cfd07e64882a0c199f