Merge cherrypicks of ['ag/19744478', 'ag/19868588', 'ag/20404110',...

Merge cherrypicks of ['ag/19744478', 'ag/19868588', 'ag/20404110', 'ag/20406276', 'ag/20327583', 'ag/20302522', 'ag/20454317', 'ag/20425770', 'ag/20541824', 'ag/20510886'] into tm-qpr1-release.

Change-Id: I491b9e378e2806d6ecc1fc895987d1987253cf54