Cumulative patch from commit 3b208346ec56342fda736e62601df485ed002493
am: d5ab1b53af

Change-Id: I9629a4ea1f170122f25359b60524af05987bfaa6