-> tiny cleanup from isLmp crunch issue 16309411 Change-Id: Ib2edff84b53ca471e7d2a2a458091db1fa2f6b42
issue 15544569 j) Change-Id: I8aff85a154cb98d865a8834f37b13e30cd03de6c