This reverts commit ff747792b8. Change-Id: Ibf2b5eeafd962e93ae4ab6290015d58c33024132 Closes-Bug: #1786346
ff747792b8