Merge changes from topic "predicates_aosp"
am: 76c275e7d3

Change-Id: If9ae0263328b73757de4578b344af0b10a3b2f8f