Revert "Merge tag 'v1.0.5' into HEAD" am: c4af2b09ad am: 4656a37401
am: ee7592d864

Change-Id: If20aac96ef7bb6a151755a5a5fb55e983d85b731