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

Change-Id: Iba30c9f752e97915dda8ef0c13a05d5795d4bf47