Merge commit 'b80ffeba415d2cd6d77f878fc59b639674e58776' into HEAD
Change-Id: I969fe7dd253711e38d5b81866f2b514a0426fe6c