To fix build, also squashed in:

Author: Mihai Varga <mihai.mv13@gmail.com>
Date:   Fri Aug 1 12:50:23 2014 +0300

    OneDrive auth fallback dialog interaction continuation

Change-Id: Id37f502217da3fde55ae93a6e1c01409509d657c