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

Change-Id: I46469911b5c12fe57a47f6cd89d9443dd917173f