LN: bring inline with AOSPAL implementation

Change-Id: I1a8746fae482ab2ce6d1120564f48f3b31179e68