Merge commit '320717adfab49735d0f5c330edda33a38540fcdb' into HEAD

Change-Id: I57d58be603c4706f8dbe50e2aa861b2c1456971f