Merge "LE Maximum Advertising Data Length (1/4)" am: 74f2e1a303 am: 2fc3834f4d
am: 066e8551f1

Change-Id: If9ee85705e7c47820e23ad79a048e4c04c4cc11a