Merge "Cumulative patch from commit 5bb7327a697108c880dd31c9e421df386c904b1a" am: f75252949f am: 0996584b8c am: 4e7d4a9db5
am: 132fb1feea

Change-Id: I3c37b78904604ae7325b8d1b230478f0985418b7