Merge "Add librank2" am: 713398f8bf
am: 679c728752

Change-Id: Ibd29dc7de5f783e170f538feae4e13751b845aa3