Merge commit '1beb988c78f15c3010e4e0f23532824714463218' into HEAD

Bug:133341561
Change-Id: If10c6173a699aeeeec6310183a326b00b085604a