Merge changes from topic "predicates_aosp" am: 76c275e7d3
am: 28f32f26b7

Change-Id: Ic3847aeda3c4d9d62432bf5918c83174e409b871