Merge "Fix mutex issue"
am: 0d396047b1

Change-Id: Ie3aa7a6b819aa4703b422f89f81637af73fe2f73