Merge commit '34f7bc8331a3deb3acf7b59be160e619486467d3' into HEAD

Change-Id: Idec9c4286b19781cb31051124a9000dba272853f