Manual merge of Exchange from jb-ub-mail

Change-Id: I326e5dc720dc29b510764142ec84770c46880429
146 files changed