Merge from LGL22 v10a && v10b open source code

Change-Id: Ib1deec93b63b5c89fe82a88d812daa72a8aa994b