Merge \"Remove the old obsolete profiler\"
am: 9c23cec953

Change-Id: I10553eb463ed036f0d1d481e6a8f777a5a0565f0