This reverts commiteedebc4850. This needs to be submitted only with the next change which re-adds minimal support. Change-Id: I1f269a7c3bbd11fc60f61d6f23e78a1933f182c7 (cherry picked from commit91181aa5de)
This reverts commiteedebc4850. This needs to be submitted only with the next change which re-adds minimal support. Change-Id: I1f269a7c3bbd11fc60f61d6f23e78a1933f182c7 (cherry picked from commit91181aa5de)