Merge "sde: Reduce level of indirections to access layer info."