tree 0d0078b9cac37c18b32658234c74fabdab85eb27
parent c43b22f47a1b3f23ec2a3c866689adf8695361a4
author Fredrik Roubert <roubert@google.com> 1453996391 +0100
committer Fredrik Roubert <roubert@google.com> 1454015421 +0100

Integrate for tickets #11989, #12018, #12030, #12031, #12032.

Change-Id: Ibeeac04c5118f6347138e86a39ec79ff334b4572