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

Change-Id: If9ce77f713a473e7224142d289e29c5003617c1b