[automerger skipped] Merge "Fix the incorrect behaviour when receiving a...
[automerger skipped] Merge "Fix the incorrect behaviour when receiving a mismatched renew lease." into rvc-dev am: bb771b1f am: 17bed15f -s ours
am skip reason: Change-Id I6fd37e6af1f6bf3a8ce8de7b9a1ef4731de5db27 with SHA-1 03e4e80f is in history
Change-Id: Ib23e810c967debd6df1669249067fc98af38865d