Closes: Bug #1353004

Change-Id: Iabb3ddca7aa8e09a770171cc859d3d5be482fb5d
Merge "Closes: Bug #1353004" into R1.10