Bug: 36462965 Bug: 35908647 This reverts commit c7614e5d. Change-Id: I25279e7c53823dad0703c7e2ea8ff91bdbc1a0f2