Cumulative patch from commit d015bb05df1e1c2b12060bd7ffa51dc980585f4f am: d13095b921 am: 9551d5d956
am: b3931d8aa9

Change-Id: I61082b32488def11772320700223151259f48881