Cumulative patch from commit 3b208346ec56342fda736e62601df485ed002493 am: d5ab1b53af
am: 0b6f38ec14

Change-Id: I23be70a0c496803b841cb257efec74180120196d