Merge commit '15fb1cac80b77f5bd11346331d59433c7fb13167' into HEAD

Change-Id: If316af916bdd6107184ef570a95b0a278b9332ba