Bug: 33798492 This reverts commit ded9fc9b07. Change-Id: I9831858ffda263496617dff29249e243c007fa12
ded9fc9b07