This reverts commit f3564e9b91. Reason for revert: BB Change-Id: If529dbe90cdae4cd9266af85de63bb8a4f808977 Fix: 386696682
f3564e9b91