Merge changes from topic "predicates_aosp"
am: 65f7e2b785

Change-Id: Ie216f64079bcd6f5cb16923ab3d7e8197218a3c3