am 30894bdf: am 1b34228b: Merge "Filter ANDROID_PROPERTY_WORKSPACE"

* commit '30894bdfd6e4c74ab673d47391e62fb14fb51381':
  Filter ANDROID_PROPERTY_WORKSPACE