Automatic translation import

Change-Id: Ib0ede62a119aa9c66dcbf70d2dd769ff9dbce52f
Fix C++11

Change-Id: I0b297b25d16c3195e04106594ae5918c8db6212d