Merge changes from topic "procrank-ready" am: d346349d50
am: 87b96ba92a

Change-Id: I9a120dafafacd6c3ebdced1898d08c7a1948d27e