Merge "Fix advertise data size estimation" am: 5b2e9f40b4
am: 21bd8d5f2e

Change-Id: If730c290a7f6745615658edd405877b0441b7d0f