Merge "Cumulative patch from commit 05e5e615e6a26d7a9f5bd0569a0baeae1bcdee49" am: 642cc64d37 am: e4c3085a9a
am: a3083b7af5

Change-Id: I20432ceff0764112517a4c04936fb93592ee657f