Merge remote-tracking branch 'origin/stable' into 5.3 upstream/5.3.1
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 16:21:04 +0000 (18:21 +0200)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 14 Jun 2014 16:21:04 +0000 (18:21 +0200)
Change-Id: I78a250e8631706606e6b003b28cdfb90ad692abc


Trivial merge