Bug: http://b/63768402 Test: repo init with the new manifest Change-Id: I0ffffb7f3312ec6c53dcc8f77f6c315ae233949b Merged-In: I4e92e9ceb9125ff10b7bc8153b95a488bed7651b