Merge "DO NOT MERGE Bump to 1.5.16 (1/2)" into ub-contactsdialer-f-dev
am: 6aaec92455  -s ours

Change-Id: Iaa680b53388bd02a89322925379c02079782a728