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

Change-Id: I8ef0afeb647511b4e1c07313cb730aed6cd05d92