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

Change-Id: I452c357f3669af39ac9af88ab09588f143732068