Merge commit '7a0d95540cf1cc4d71910a0a9b0403a8b0e40679' into HEAD

Change-Id: Ic3b480ebc162f4f69530261527ca349cf1a6aa47