This reverts commit 31003c48c1. Bug: 28398205 Change-Id: Ia884957e224f46157af31814c32c5e0e1a33b7b8
31003c48c1