Merge commit 'cbe6b1daa3aab56b35c1cb0c06acb9c270f11540' into HEAD
Change-Id: Ia1aeacc98f2069c8f9e7ea9ed7b495cb9d7c5665