This reverts commit bc4fe8d836. Bug: 15472289 Change-Id: I106300b39fd5999b77410890da835efb8ce19c7c
bc4fe8d836