Synchronised with kayobe @ 3c178846a4e40bfc1c5f6f3bed2f5f70bf226cf0. Change-Id: Ia2b3399e234016139fadd92b3c583483a064729e