Squashed commit of the following:

commit 78ca0db658fe6253d506916e36319e620476f809
Merge: 10c3003 7bc5587
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Mar 26 21:59:00 2013 +0000

    Merge "Complete provisioning, and complete provisioning again."

commit 7bc5587cab718f144deb46a5056d4ebd01a58a91
Author: Jean-Baptiste Queru <jbq@google.com>
Date:   Tue Mar 12 07:26:37 2013 -0700

    Complete provisioning, and complete provisioning again.

    Because once is not enough.

    Bug: 7546122
    Change-Id: Ic4472d517be622f176807f175f9f7df41d286647

Change-Id: Id31e4fee6812149a34ed69f585434974783e6280