Merge commit '30225bec953275a224d7b2b11f66c1223c3b9998' into HEAD

Change-Id: Id66b909b5d212f52425a0a2a22ba5777c736d459