Merge commit 'ce586cbde7d9fc44649b43537313b4945210ef46' into HEAD
Change-Id: I638ce9fcf0e1e038e6597c9d93fdfe82e9452923