Merge "Updates to shared lib for Launcher" into pi-dev
am: f4833c4fb2

Change-Id: Ie8918e8b5e040a1cdd68873189e15682583b7c47