Cumulative patch from commit d015bb05df1e1c2b12060bd7ffa51dc980585f4f
am: d13095b921

Change-Id: Iebe32a3f3547decdcea4755d0c45fe2a96054df9