Update device branch for storage locations

Change-Id: Ieb02c6aabe46b35fe8a35e2d92d6d10e88c03cc5