am 861d52c8: Merge "Remove unnecessary flags" into ics-mr1

* commit '861d52c80430edeb0eba6f73cd0e206e27f4ac6b':
  Remove unnecessary flags