This reverts commit 455ffaafcd. Bug: 23186109 Change-Id: If768c4c85b8dbf1ffe881eca3412d92150fb019f
455ffaafcd
87eb4007