Merge changes from topic 'ArcPagingBackport' into arc-apps
am: dbf3e29ff8  -s ours

Change-Id: Iac28cbc920fa60b3dbc92269755b86b18996fa33