Updating for 2.6-rc0-322-geeed497

Change-Id: I28412beb8e994c4836fd5439146dcd4545440ed5