Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1d am: 0550a7221b
am: c11f019e2f

Change-Id: I4645f478a402648d74c1d103f87959cd71c57ae5