[automerger skipped] Merge changes from topic "fdr_merge" into rvc-dev am: 5d4ed0240a -s ours

am skip reason: Change-Id I151f1af4aca446cc52e669c5c3ea2b2e55acb468 with SHA-1 973b8c10d1 is in history

Change-Id: I220c8c52f1ec895e590d34d702406385e7920de9