Merge commit \'4158fbc54acdcb2c7cc52704a45e0e9f3e93ffe1\' into HEAD am: 02fa7b88cc am: ba68fcfa5a
am: bf2d4c864a

Change-Id: Ie6f0aafa6a3a9bbbcdafb547a17c38c1e5d5672b
tree: 417c8738bccdf592a90ed2706b1b31215391b669
  1. tests/