Merge commit '2b1480850773c9cafb5a383814274f06239af914' into HEAD

Change-Id: I8c1e9702be51b9217b80385d7537e37fc2452101