Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67 am: 11d331a2af am: e25db57060
am: 66ce952a4e

Change-Id: I6882e50bfade31b43c71569a6fdff28d1ae86857