Merge "Cumulative patch from commit 5bb7327a697108c880dd31c9e421df386c904b1a"
am: f75252949f

Change-Id: I025ff7daa57832e5e95df5b98e27ca22627c2922