Merge "Fix UNSTABLE build issue led by unit tests"
authorReinaldo Penno <[email protected]>
Wed, 29 Apr 2015 07:04:02 +0000 (07:04 +0000)
committerGerrit Code Review <[email protected]>
Wed, 29 Apr 2015 07:04:03 +0000 (07:04 +0000)

Trivial merge