Merge commit '23d990ca' from 'stabilization-f69489' to 'master'

Change-Id: I9a359fc5ac3f3cd50c7a4ed8b4de5d17d5900ceb