Merge changes from topic "predicates_aosp" am: 65f7e2b785 am: 06661f6b88
am: 096c2b9794  -s ours

Change-Id: I7379423c5ef95bc51127fe64bac46d15603ac991