[automerger skipped] Add FILL and RANK ops am: 53a51cb352 am: 14dca9ee25 am: 7f9b864f11 -s ours
am skip reason: Change-Id Iebdfa600d84e31532807740c21d95cae41c76ad5 with SHA-1 8b3f240ea3 is in history

Change-Id: I0bdef7d24d12a3deeb1755fcde831ef73b867e71