Change-Id: I45289d46b65faffc7a3a3dd46382899162f3aaab
Change-Id: I564ddf433d371f45ba78a10f73bb182d484c56f2
Part of fixes for b/5517524 compose on tablets needs redlines Change-Id: I286c6fa57229e993660dd307fc14b929b701b47f