Merge "LE Maximum Advertising Data Length (3/4)"
am: d7c37e7235

Change-Id: I99c507e4a65c51dcdfadd146593ed194a83826e8