double commit bug-id:1349687 in R1.10, mainline commit was Id6fbf264922b23b7df5b506637a7b0b2d5d4535f

Change-Id: I2496af65387ab12ac06a65cb9569527e21933f58
Merge "double commit bug-id:1349687 in R1.10, mainline commit was Id6fbf264922b23b7df5b506637a7b0b2d5d4535f" into R1.10