Merge "Merge "Add warning message when entering loop twice" into rvc-dev am: 8fa645a2 am: cbae0e52" into rvc-d1-dev-plus-aosp