am 06d107fc: Merge "Remove even more unnecessary flag" into ics-mr1

* commit '06d107fc963a451415e7ffdbf72e34198d85fc35':
  Remove even more unnecessary flag