[SQUASHED] LIBs fix

Change-Id: Ie18eab6bb689dd827b8f3c16ed655fea5981e4dc