Merge commit 'a0db90ccf4bc5bb681fcc89faed2a32bb90c8add' into HEAD

Change-Id: Ie7077444e65c332d24cd1c1ac8c5839dadd4b538