Merge commit 'b129a3650688db6ce3d3b949b69cd57dde5db785' into HEAD
Change-Id: Ic1178dbeb8ba680eafc326964a8ccb3c30fa23a3