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

Change-Id: I45b12995296481d8d967aa1248e4aa632a2a2965