Merge "Merge "Simplify synchronized code and add comments" am: 9791b54b am: b57f32e6 am: 9760c427 am: ddf2351c" into rvc-qpr-dev-plus-aosp