Merge commit '6a19c5cabf1615ffce654a1203554bbaa1d1f72e' into HEAD

Change-Id: Ic7cd65ff8d2fd397a77f635b21bd06bfc17a38dc