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

Change-Id: I666af86709586df062e323d58915605f68b6ca46