bionic: adfc007dbf936bd021d79ba2d2c360a3cfc77be9 5/19 2014 Change-Id: I4836f04d9b5b68abe7896e246c9dffa2e175e4ca