Merge commit '3ff337db' into merge

Change-Id: I3c09d1f888da684b50d79a8e539f47c8bcf85646