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

Change-Id: I6c37e5fb9c0d4c5aad5439ca56bd7a0aa7a3d145