Merge "Merge "Simplify synchronized code and add comments" am: 9791b54b88 am: b57f32e68a am: 9760c42784 am: ddf2351c06" into rvc-qpr-dev-plus-aosp