Merge commit '1fba8ffeb09ad264b569d1210b1220bb992e526c' into ks-aosp.lnx.3.0.r4-rel
tree: b93d65cb834973bd40ce5c6c4196ea33485f8dba
  1. iorap/