Merge commit '5ef374a92ab9e88659b96d917c99568a925ef432' as 'LYNQ_PUBLIC'

Change-Id: I85e73370474fdd4ae73d301b67d93fedc5e26065