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

Change-Id: I71bbfd0afb9c4f5e675cbd2a402c96669b91a9e5