Merge "Fix static_assert compile issue" am: 9845354ef7 am: 6b3c4365b6 am: fa72bc1b48
am: 45391d1b76

Change-Id: I4449e6e5e6c93fb71547e7c7ba1fd54479c4a6f6