Merge commit 'ad42088bfa6ced29e8c134c1073db9e481c67590' into HEAD

Change-Id: Id3431126c3be52a56340ed4f030864bc225ef865