Merge changes from topic "predicates_aosp" am: 76c275e7d3 am: 28f32f26b7
am: ff8201b34b  -s ours

Change-Id: I8bcfb125b501a3f6db65b931bcf416c72bc849c6