Merge "use FgThread.class instead of UiThread.class for lock object" am: e2fddf56a4
am: a7d45cf3f0

Change-Id: If9a509ff24e5ea52602f50eb977ac94652bf2978